Fixed bug #576492 "GtkBuilder does not respect G_PARAM_CONSTRUCT properties"
authorJuan Pablo Ugarte <juanpablougarte@gmail.com>
Fri, 3 Jun 2011 17:38:59 +0000 (14:38 -0300)
committerJuan Pablo Ugarte <juanpablougarte@gmail.com>
Fri, 3 Jun 2011 17:38:59 +0000 (14:38 -0300)
Added G_PARAM_CONSTRUCT flag in gtk_builder_get_parameters() checks as suggested by Johan Dahlin.

gtk/gtkbuilder.c

index 30fed9087fd410a8dd665c6b48fee1096989d07e..3e970e037a77ebcf45a772d02dbcfc4337e4df14 100644 (file)
@@ -503,7 +503,7 @@ gtk_builder_get_parameters (GtkBuilder  *builder,
       if (G_IS_PARAM_SPEC_OBJECT (pspec) &&
           (G_PARAM_SPEC_VALUE_TYPE (pspec) != GDK_TYPE_PIXBUF))
         {
-          if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
+          if (pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))
             {
               GObject *object;
               object = gtk_builder_get_object (builder, prop->data);
@@ -540,7 +540,7 @@ gtk_builder_get_parameters (GtkBuilder  *builder,
           continue;
         }
 
-      if (pspec->flags & G_PARAM_CONSTRUCT_ONLY)
+      if (pspec->flags & (G_PARAM_CONSTRUCT | G_PARAM_CONSTRUCT_ONLY))
         g_array_append_val (*construct_parameters, parameter);
       else
         g_array_append_val (*parameters, parameter);